[automerger skipped] Merge "DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit." into qt-r1-dev am: 0ac85feb6f
am: 691b6da61f -s ours
am skip reason: subject contains skip directive

Change-Id: Iba487b1372678652c94e236f5349ace3ef6fc5d5