Merge "Prevent activity leak which was introduced in Ifb86c931" into ics-factoryrom