PSGAN++: Robust Detail-Preserving Makeup Transfer and Removal