Merge "CameraManager: Swap propertyName / packageName in call to getProperty()" into tm-qpr-dev