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

Change-Id: Ie6a719b7dcc11f5b5413ce1d6ff615c298a7a58e