Merge "Keeps power key intercepted during a panic gesture" into sc-dev