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

Change-Id: I4166a93da05e8a3cc216748cc5acc705ceb051da