Merge "Fix tap is wrong in landscape with cutout disabled" into rvc-dev