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

Change-Id: I0c9a39f309513d2b12fcb63e6fa6c067228b50dd