Merge changes from topic "free_up_space_card_preference" into sc-dev

* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference