Merge "Work on issue #74404949: Screen state usage API" into pi-dev am: 886fc6aef0
am: b45bc522f6

Change-Id: If566b8baf8367f31d0f8dc1107c547cc9ee11913