Merge "Update to latest constraint layout library"