Merge "MAP: Fix to handle crash when transparent flag is set."