Merge "Only request focus if change was self-triggered" into rvc-dev