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

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