Merge "Don't set view clicked listener unless app provides one." into lmp-mr1-ub-dev