Merge "rollback AFTER commit causes warning message from sqlite bug:2486731"