Merge "[automerger skipped] Merge "Fixed content capture whitelist for specific activities." into qt-dev am: 845d5ee587 am: 2d137edf28 -s ours am skip reason: change_id I2c76a01bd98c4154c4c59099f1368232d2dba80d with SHA1 41e9eb0aed is in history"