Merge "Treat Bluetooth-smoothened events with modified timestmaps as synthetic"