Merge "Dashboard login page assert string fix"