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: f3018bc5
am: 0c7f3ea0
* commit '0c7f3ea0':
Fixed a bug where the expand button was invisible
Change-Id: Iac09d6f897c3133949184ab4ac4bec7f71cf4be6