Merge "Handle the UnsupportedOperationException when register TaskOrganizer" into rvc-dev am: 625280b87c

Change-Id: I6cae0a36ee1414ae6af0a82d85bc77511557b9fb