Merge "Merge "Partial revert "Add overlayable configurator resources" am: 2c206f86 am: 7739e07e" into rvc-d1-dev-plus-aosp am: 3d0afda3" into rvc-qpr-dev-plus-aosp