Merge "Disable existing ContentCapture sessions if service changes their whitelist status." into qt-dev
am: d97db54da4

Change-Id: I2e404b24e66d02afcc9ab64f15b67d391f914997