am 96f6a1a9: (-s ours) DO NOT MERGE - Fix build issue isScreenOn
* commit '96f6a1a9e7806b34e7ae8c21b6febf965acf16e1': DO NOT MERGE - Fix build issue isScreenOn
This commit is contained in: