Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev