Merge "Merge "Camera features: Relax relationship between AR features" into pie-cts-dev am: 8c6e0ea760"