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

Change-Id: I8fad3cd142cf0e064eacaebaba78f4e091bd9263