Merge changes Ib7ce422d,I977e7750 into sc-dev

* changes:
  Added rounded corner to bitmap Widget Preview
  Correct RoundedCorner enforcements.