Merge changes from topic "375108715" into main

* changes:
  Move camera type back to project
  Remove the duplicate gxp rule