Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev