Merge changes from topic "clockicon" into ub-launcher3-master

* changes:
  [automerger] Create a param to return scale used for bitmap creation Bug: 110082040 am: 4bc3cc3111
  Create a param to return scale used for bitmap creation Bug: 110082040