Merge "Differentiate user resize and system expand" into rvc-dev