Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77