Merge "Fixed a bug where the expand button was invisible" into nyc-dev am:...
Merge "Fixed a bug where the expand button was invisible" into nyc-dev am: 6088cf67 am: f3de85d4
am: 21fa97b7
* commit '21fa97b7':
Change-Id: I54056e87ec575a08782d866b6c52e647f1e3be70