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

* commit '230719c7b5da0d36bd4e475cfba258011ab32d95':
  Clean up some flashy jank (issue 7454766)