Merge "Make DefGrantPolicy always grant ALWAYS_LOCATION" into qt-dev