Merge "Enforce setting up SystemUIProxy on the main thread." into udc-dev