Merge "Switch display uid whitelist from task to activity"