Merge "Fix wrong 3 button order in landscape mode sometimes" into main