Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev