Merge "Show correct activated/selected effect for lists"