Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev