am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev

* commit '640cf0ab0a38888717febed818b015a8767a7010':
  Clean up some flashy jank (issue 7454766)