Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev