Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev