Merge "Switch to the correct camera feature list" into lmp-dev