Merge "Sim Pin layout fixes"