Merge "Fixed content capture whitelist for specific activities." into qt-dev
am: 845d5ee587

Change-Id: I7b4817d097067667e518ad8e58bd2ed5f17c2b8d