Merge "Aviod divider surface memory allocated after boot" into rvc-dev