Merge "Chaser for ag/11973247 to wrap content" into rvc-dev