Merge "Fix account screen in split screen" into nyc-dev