Merge "Do preview grid migration in a worker thread am: 6b79a3767d am: f1c369589a am: 5dc6bbc830" into rvc-qpr-dev-plus-aosp