Merge "Fixes @Nullable issues SystemUI-tests" into udc-qpr-dev