Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev