Merge "Fix more cases where blips show up in All Apps"