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

Change-Id: I74bbf117f527316c1207ad2112f1e659440fdddf