Merge "The main menu must not be set as a pending activity instance"
am: ddcd1bab60

Change-Id: I3a0f5f584758c2734c182d67f2b7b0373a40c010