Speculative fix for exception in CoordinatorLayout.onLayout
am: 3c9fb156e6

Change-Id: Ifc56967ad6295722b099a358cb48245a24981061