Merge "Merge "Improve grid preview performance" into rvc-d1-dev am: 8951db2d23 am: 39d900553a" into rvc-qpr-dev-plus-aosp