Merge "Move always-on-top to the callers" into rvc-dev