Merge "Add required setup for quickstep tests to be run devicelessly" into main