Merge "Start activity from top z-order when attaching process" into main