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

Change-Id: I96920159830c2fe73d75c033fb00935857d4a0a9