Merge "Fix privacy control long click jank regression" into main