Merge "Fix text alignment in SIM lock dialog." into pi-dev