Merge "Waiting for NexusLauncher to go away after swiping up from menu" into sc-dev