Merge "The main menu shall not be launched when the current session ends" am: 056ae69a55
am: 0a4f6135ea

Change-Id: Ia5018356eb07bb9cd8ff996c2fb3b9824b860c02