Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev