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

Change-Id: I45e8c0e6e3caa9551646c0d26eac1a78a2fa56cd