Merge "Final tweaks to power menu" into oc-dr1-dev am: 0a2ada5416
am: b10cf4d1d6

Change-Id: Ie720e25985863451ff2b2219764e1af279c6a96f