Merge "Delay unmuting sensor when device is unlocked" into sc-dev