[screenlock] Integrate feedback from review