Hey, @nullaus , @alivedise let's sync up here.

@nullaus can you steal this part? It should fix the position issue for the cardview, and will prevent future conflict :)

Ideally we should land a mix on this change + your change to select the correct app in the cardview, then we'll land this patch.