Merge "FP2-1665: Lock Screen Clock can show negative duration" into fp2-dev-v2