Merge "Fix the UDFPS overlay being offset by the status bar"