Merge "Update taskAffinity with application uid." into rvc-dev