Merge "Allow carrier-priv apps to scan with location off" into qt-dev