Merge "Fixed a bug where the expand button was invisible" into nyc-dev
am: 6088cf67e8

* commit '6088cf67e8895b5ae09e8d99d57f9ae9279a2470':
  Fixed a bug where the expand button was invisible

Change-Id: Ia7bfba0e245781f80bb1d7a9a068f765661177a7