Merge "Don't allow background apps to change theme" into sc-dev