Workaround for login expiry theme switching issue
Merge branch 'master' into MNF

* master:
  Workaround for login expiry theme switching issue