Merge "Remove OverlayManagerWrapper class out from Settings"