Merge "FP2-1655: Lock Screen Clock - Adapt layout for corrected dpi" into fp2-dev-v2