Merge changes Iab543850,I305f8a0e

* changes:
  Keep promo state on rotate
  FAB is no longer visible on return to call dialog.
tree: 37a4eaebaa8922b4b4731861884027290d85e741
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE