Merge "Fixed status bar glitch for apps that access internal res" into tm-dev