Apply (cherrypick) record dialog fixes to frodo branch