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