Merge "Make interceptMotionBeforeQueueingNonInteractive per display"