Merge "Defer theme flags when view isn't attached"