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

Change-Id: Iaaa3317b0dc8c6e320aa4a8b2677bcc9f1735234