Merge "Fixed focus adjustment issue with freeform stack."