Merge "Allows Launcher to recover gracefully into OverviewSplitSelect state" into tm-qpr-dev