Merge "Fix storage title clearing in multi-window" into nyc-dev