Merge "Fixed SIM pin pad overlap" into qt-dev
am: 13712a3b40

Change-Id: I01ea6261ee9152744c28614c32acdd5a8b142578