Merge "Put SIM locked text in parenthesis" into qt-dev