Merge "Setting for Lockscreen Clock" into tm-qpr-dev