Merge branch 'CR_1827_cannot_record_play_simultaneously_515_walker.chen' into 'jh7110...