Merge "Clear home surface crop size while being organized" into rvc-dev