Merge "Add a flag for the libcamereservice changes." into main