am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev

* commit '9477f8dee1068f7b07713a33b18fd4aea6b5c039':
  Fixing up glowpad scaling issues (issue 7494378)