Merge "check for parent before embedding titlebar"