Merge "Fix a NPE with outlineProvider="none""