am 85ebed39: am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb

* commit '85ebed39e4b7710b56e25d10038172dde12ef7b0':
  Fxi initial error popup dialog in TextEdit and refreshed assets.