Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev