Merge change 20775

* changes:
  Fixes #2021442. Prevent app widgets from clobbering Home's view ids.