Merge "The STK menu activity cannot treat subsequent user input" am: 4424964d53 am: d5ceb344f5
am: ba2fc4947f

Change-Id: I2ece989fd27e6c64c24b67cc9a0debb280f18d23