Merge "Fix focus after moving"