Merge "Use strong reference to parent Handle when creating layer"