Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev