Merge "Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev am: 58b0e698 am: 4254f6e4" into oc-mr1-dev-plus-aosp