Merge changes I915fb1ae,I3751cbe7 into main

* changes:
  Add support for location viewer config location
  Add nullability annotations