Merge "Switch to release version of constraintlayout"