Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev