Merge "Merge "Update scroll chip on rotation" into 24D1-dev am: e577313649" into main