Merge "Fix more windows at framework on system gesture mode" into rvc-dev