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

Change-Id: I6a8074b4d0b14b0c3ca2386c45a6a1d49d353e4c