Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/zxdemo/notity/NotificationUtils.kt
#	app/src/main/java/com/zxdemo/utils/GlobalTimer.kt