Merge "Fix small alpha flicker for cross activity back" into main