Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev