Merge "Change commit() to commitAllowingStateLoss()"