Merge "Fix potential synchronized race between SF and InputFlinger" into sc-dev