Merge "Revert "SF: Update InputFlinger outside main thread""