Make frame layout consistent between dbg and product build and implement offsets accordingly. Reviewed-by: goetz, gromero