Merge "Fix to snap notification view back when not clearable while updating" into nyc-dev