Merge "Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am: e68228fbd9 am: 225bedbc86" into nyc-mr1-dev-plus-aosp