Merge "Swap order of alt and 3rd quick contact icons" into nyc-dev