Partial 93205 port #133

Open
leo60228 wants to merge 2 commits from leo60228/cutthecord:93205 into 2021-05-31

2 commits

Author SHA1 Message Date
65d955f011 Port patches to 93205 2021-09-20 12:13:05 -04:00
a8124a4796 fix patchport 2021-09-20 11:23:55 -04:00