Merge "Move displaying mag bounds into surface transation" into oc-dev