Merge "[PB] Filter out activity transition under TaskFragment" into main