#14595 Fixed bug with screensaver
# 14595 Fixed glitch with otp code live time
Merge branch 'i14595' into development

Conflicts:
	lib/single_auth/application_controller_patch.rb