Merge "Ensure the device wakes up from doze when tapping expand button" into sc-dev