Merge "Update power menu + dialog" into oc-dr1-dev am: 1e6b7d7b15
am: c858cc7d8c

Change-Id: I6e69225684355d003cc4b53e47787fe64c7fb187