Merge "StkMenuActivity shall handle timeout exactly even in the low-power mode"
am: fe8b52fe65

Change-Id: Icaae66c1bf40677190b381717f462c1dcd226eb0