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