Merge changes from topic "am-d377bc6204204dc5bfea0ff1d15efb0c" into main

* changes:
  [automerger skipped] Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e25503 am: 56bc852fe1 -s ours am: 8e70c15347 -s ours
  [automerger skipped] Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev am: 2be625e241 am: dd7ae8709e -s ours am: 622ff1d5fb -s ours