Merge "Remove enableOverlay and disableOverlay tests"