Merge "Fix for Activity Transitions restoring views bug."