Merge "Fix "Pause work apps" button in strange location" into udc-dev