Merge "Fix AlwaysOnTop stack Z ordering issue" into rvc-dev