fireball: update and cleanup MMS overlay

Change-Id: I0f091b19be4ad601c458834df962e4860f2ecce3