Merge "Pin focus field redone to adhere to sysui arch" into main