Merge "Disable another timing sensitive test on dist builds"