Merge "Remove redundant ref frame pointer assignment"