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