Merge "Add a parent id to the offscreen layer parent proto"