Merge changes I3508c15a,I7b735ec0

* changes:
  Always show rule creation option.
  Remove some dead zen mode code.