Merge "Remove activity from unknown app if starting window is relayouted." into sc-dev