Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev