Merge "Zen: Maintain selection throughout rocker session." into lmp-dev