Merge "Fix rectangle AA offset calculation" into jb-mr1-dev