Merge "Enable QS button for new power menu in AOSP" into sc-dev