Merge "Fixed content capture whitelist for specific activities." into qt-dev