Merge "Fix up for forget storage screen" into nyc-mr1-dev