QS power menu fixes

Change-Id: Ia3b8ca1beab8780b2f2c087004693151db1b6c6c