Merge "Fix copying null reference across themes"