Merge "Adds supportsCommitHaptic" into main