Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev