Merge "Catch service callback RemoteException" into main