Merge "FP2-1223: Fairphone Lock Screen" into fp2-dev-v2