(merge from 2.0-ongoing -r1911:1912) fix audio clock handling of key press; fix crash...