Merge "Controls - Add optional power menu layout"