Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev