Merge "Fix unmount up button" into nyc-dev am: 7680871d92
am: d88d281304
* commit 'd88d2813043075ad470898f0a053bd04a46bbe8d':
Change-Id: I52319c8d01a6a91d30f632554c24d52b5c1dd277
This commit is contained in: