Merge "Handle the UnsupportedOperationException when register TaskOrganizer" into rvc-dev