Merge "Use ALWAYS_FATAL if touchState is out of sync" into main