Merge "Adding unique task affinity for FallbackHome activity" into qt-dev