Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev