87d2169b74
automerge: c89cdf2 * commit 'c89cdf2ad435b3b5da16405a0eceb600e93b7a3e': Avoid bug in LinearLayout measurement