Merge "Turn off media time adjustment by default" into gingerbread