Merge "Revert "Split HeadsUpManager implementation to HeadsUpManagerPhone""