Bug fixes
Bug fixes
Merge remote-tracking branch 'remotes/upstream/dev' into dev

Conflicts:
	TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
	TMessagesProj/src/main/java/org/telegram/ui/NotificationsSettingsActivity.java
	TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java
Fixed merge changes