Merge "The labels of button in Wi-Fi input and "skip screen lock" dialog...
Merge "The labels of button in Wi-Fi input and "skip screen lock" dialog doesn't apply GlifV3 style" into qt-dev am: a60def7d
am: e40d4097
Change-Id: I2f3eb7addaa929837cfb2d27b58f417441cac53d