Merge "Fix gear being covered on notification update" into nyc-dev