Merge "Fix unmount up button" into nyc-dev