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