Merge "Move #mDeviceIdToShowIme to binding controller" into main