Merge "Open drawer only on first update." into nyc-dev