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

Change-Id: I902b22a4c1945e55a0a62e3386647fc7fad33b57