Merge "Fix TextView clickable state when using onClick attribute" into lmp-dev