Merge "Fix usages of PopLocalFrame to include returned local reference"