Merge "DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit." into qt-r1-dev
am: 0ac85feb6f

Change-Id: I9925497fac1b06e2ac99ded86b6f24da114360cf