Merge "Fixed SIM pin pad overlap" into qt-dev