Merge "Tweak to isOnLockscreen" into main