Merge "Fix issue #8410116: "Disable your screen lock" permission..." into jb-mr2-dev