Merge "Fix privacy dot being in the wrong corner on some devices" into main