Merge "Clear applied layout overlay if new layout overlay is null."