Merge "Change HeadsUpManagerPhone to use VisualStabilityProvider"