* commit 'd4337ae09b1646a0c1dec2869c350e496d564348': Fix issue #7342364: JellyBean broke Toddler Lock, again