Merge "Remove call to hidden suppressLayout()"