Collecting water from cauldrons with glass bottles in Creative mode is still inconsistent

Even though collecting water from water source blocks with empty glass bottles in Creative mode now works as it is supposed to, collecting water from cauldrons is still incosistent. Instead of receiveing a water bottle, while still keeping an empty glass bottle, the empty bottle is the only thing you'll keep in inventory. The amount of water in the cauldron does not matter.

Clones MC-74056 and relates to MC-175492 and MC-194686.