Merge "Fixes more  @Nullable issues in System UI and WMShell." into udc-qpr-dev