Merge branch 'synaptics-rmi4' into next