Merge "Show locked padlock if sim card is locked" into qt-dev