Merge "Support of restart process of non-top visible activity"