Merge "Prevent resize animation from changing the requested visibilities" into sc-v2-dev