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