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

Change-Id: I6561e5313a24b076e947f2ed875097883684f001