Merge "Don't try to connect camera service if it is disabled." into cw-f-dev