Merge "Sound screen migration" into main