Merge changes from topic 'am-48247b8c-42e3-40cc-85c8-ea172aaf368d' into ub-launcher3-master

* changes:
  Fixing widget id restore broadcast. am: f5b4b80972 am: 1a7909ff7b
  Fixing widget id restore broadcast. am: f5b4b80972
  Fixing widget id restore broadcast.