Merge "Finish autofill session when service dies."