Merge changes from topic 'am-fbc85c75-5d3b-419b-8eda-1fbdb126a8a7' into ub-launcher3-master

* changes:
  [DO NOT MERGE] Making various icon shape options as non-translatable skipped: 1f5a264fac
  [DO NOT MERGE] Making various icon shape options as non-translatable