am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev

* commit 'c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8':
  Preventing more than five widgets from being added in the carousel (issue 7502935)