Merge "Move kids mode relative logic to wm shell" into tm-dev