Merge "b/3215774 Fix scrollMode notifications"