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

* changes:
  [automerger] Adding check for min_width and min_height am: 84eba486 am: 8429c5e6 am: 779c09b4 am: 3d56f0ca am: 5ce8567f
  [automerger] Adding check for min_width and min_height am: 84eba486 am: 8429c5e6 am: 779c09b4 am: 3d56f0ca
  [automerger] Adding check for min_width and min_height am: 84eba486 am: 8429c5e6 am: 779c09b4
  [automerger] Adding check for min_width and min_height am: 84eba486 am: 8429c5e6
  [automerger] Adding check for min_width and min_height am: 84eba486
  Adding check for min_width and min_height