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

Change-Id: I44a31c5181f15667ba826e120f62f3855178d639