9d563550
* commit '9d5635501a9fdf2f9ef5b51a4be021622f2f9a67': Align "from code" parent-child preference flow with "from XML"