Merge "Fix alternate intent flags on quick contact"