Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev-plus-aosp