Fix notification issue on time/date/zimezone change
Fix gradle script errors in Android Studio