Merge "Revert "Resolve session linger caused by RemoteFillService."" into udc-qpr-dev