Merge "Remove const_cast to layer handle"