Merge "Skip notifying configuration changed for restarting activities"