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

Change-Id: I9e988c9e48c1ceca17589bef18e7e3846cd89b60