We need to pull these changes from upstream's lineage17.1 branch into /e/' v1-q build
lineage17.1
v1-q
#3866 #3014 #3847