Merge "Fix problem with calling onConfigurationChanged() too much."