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