Merge "Enforce mutual exclusivity in setScrollCaptureHint" into sc-dev