Merge "Fix order of operations warning in libui"