Merge "Disable lock screen and enable location in THM" into qt-dev