Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev