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

Change-Id: I0f87b27f5aac96f9e05b11cbf6dadbb2c6b0d428