Merge changes I75d810e4,I50111f0c into udc-qpr-dev

* changes:
  Doing null check before generating Extra Dim tooltip
  Doing null check before generating Font Size tooltip