Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev

* changes:
  Fix DismissView cannot be clicked sometimes after boot
  Fix RTL issue of ImageFloatingTextView