Merge "Properly layout InlineContentView" into rvc-dev am: 7f70f707 am: cb5de77e am: 70587725 am: 171e46ee Change-Id: I62beabf1e624e9ff0a7b71f6ec0c3aa4c2af9717