Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev