Merge changes from topic "am-8a5b86f8-be8c-4062-afcf-d631975ceb6b" into cw-f-dev

* changes:
  [automerger] Adding check for min_width and min_height am: 84eba4863d am: 8429c5e659 am: 779c09b462
  [automerger] Adding check for min_width and min_height am: 84eba4863d am: 8429c5e659
  [automerger] Adding check for min_width and min_height am: 84eba4863d
  Adding check for min_width and min_height