Merge "Several improvements and bug fixes to the inline autofill flow" into rvc-dev