Merge "Unify toast presentation code" into rvc-dev