Merge "Adding null check when unregistering slice relay handler" into qt-dev
am: 29fe1106dd

Change-Id: Ic406c2e0b8e07e1812713e1b4e5b7b5a7b7ac17f