Merge "Remove unused function and fix typo from OverlayProperties.java" into main