Merge "Fix potential NPE in autofill Session" into rvc-dev