Merge "Supporting more non-default close activity callback for PB" into main