am 483041c9: 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 '483041c9c4b2812d67de53e567ce059d5e3417bc':
  Preventing more than five widgets from being added in the carousel (issue 7502935)