Merge "Do not reload theme when managed profile" into sc-dev