Merge "Update scroll chip on rotation" into 24D1-dev