Dim logic changes
Add OnSystemTimeChangeListener hack