Merge "Request layout when updating child layout params." into oc-dev