Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev