Merge "App info > storage updates" into mnc-dev