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

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