Merge "Update power button gesture menu" into sc-dev