Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev