Merge "Merge "Only use grid layout for power menu when wallet is visible" into...
Merge "Merge "Only use grid layout for power menu when wallet is visible" into qt-dev am: 31b3161a am: 7069335b" into qt-r1-dev-plus-aosp
am: 44e809f5
Change-Id: I7d5446a7f3520b183e6348f8c0ad0a03a9fe4197