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

Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd