Merge changes Iab543850,I305f8a0e

* changes:
  Keep promo state on rotate
  FAB is no longer visible on return to call dialog.