Merge "Use EXTENSION_FACE_RETOUCH instead of EXTENSION_BEAUTY"