Merge "Limit Activity taskAffinity to application uid"