Merge "SideBySide2: Add preference for a subset of supported CM3 themes"