Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev am: 58b0e698fc
am: 4254f6e457

Change-Id: Ia57e25e0767ced3dd9df518f46be0a99967ac03d