Merge "Invalidate launchMenuActivity at the time of call" am: 7ea9a57532
am: eaae308f1e

Change-Id: I6a6133f548674213615ac2deda61714946c86ea0