Merge "Fix NPE when user swipes back in All Apps and no matching view found" into tm-dev