Merge "Fix issue when preference screen title won't change depending on the device.." into tm-dev