Merge branch 'screen-stop' into dt-test