Flash messaging working again and much improved

Change-Id: Idac4c81d0853c5ae57ab40b695d578c01fb283fd