Merge "Disable smart lock when in power menu on lock screen" into sc-v2-dev