Merge "Fix FAB position after hang up with secondary call." into nyc-dev
am: f0bf4ca8ca

* commit 'f0bf4ca8ca4b7d06db99f416480b81b0148ba6dc':
  Fix FAB position after hang up with secondary call.