commenting changes made to fix android flickering