Merge "Remove workaround for unrotated gesture monitor (1/3)"