Merge "Guard Database::explicitTrxActive() against returning false while in begin()"