Merge "Add SCREEN_STATE flags to QuickStepContract" into tm-qpr-dev