Merge "SF: update mInputFlinger on main thread"