Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev