Merge "Merge "Don't allow background apps to change theme" into sc-dev am: d47e6d84d1" into sc-qpr1-dev