Merge "Close inline controls / hide the gear when interaction outside occurs" into nyc-dev