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