Merge "Fix UDFPS overlay being offset in landscape mode"