Merge "Integrate keyguard paging hint" into jb-mr1-dev