Merge changes I7b04b164,I7d5ef1ef into ub-launcher3-master

* changes:
  Fix Grid tab's option list vanish issue
  Change Style tab's content layout