Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev