Merge "Fix SideFps indicator being covered" into udc-dev