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

Change-Id: Ifce634aa74f79829ba618b0d8b20c75e04a38532