Merge "Disabling popped preview key since it is currently broken. am: c448acb573 am: aeffc14105" into rvc-d1-dev-plus-aosp