Merge "Remove option to set barrier layer by surface"