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

Change-Id: Ie28182bbeea2370062be3f2d801e7ad851bef3ca