Merge changes from topic "am-b4ccc74b-9fac-466f-997f-63416774e49c" into ub-launcher3-edmonton-polish

* changes:
  [automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11
  Do not execute controller callbacks, if controller is null