am 7805b032: Merge "Prevent activity leak which was introduced in Ifb86c931" into ics-factoryrom

* commit '7805b03239813a4a3627ba9d66774c40c627fba8':
  Prevent activity leak which was introduced in Ifb86c931