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

Change-Id: I6461b114459160029df2caf8bfe86ad761cfd9be