Merge "Fix display id would be ignored if app been launched from pending activity queue."