Merge "Avoid resolving secondary home activity if no need" into qt-dev