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

Change-Id: I8bf5a74fa0f67636e04fcb7cef269eab4cbd83f6