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

Change-Id: Ib4fee34f8605403b67fd311508da08149d31b367