Merge "Add property to disable camera service proxy." into cw-f-dev