Merge "Fix issue of indication area over top of customize lockscreen button" into udc-qpr-dev