Merge "Lockscreen targets: more unification" into cm-10.2