Merge "Move all the shared Screen Lock details into a reusable utility class"