Merge "Make snap with enterAlways|enterAlwaysCollapsed" into mnc-ub-dev am: fb2e1f1
am: b9b83cc

* commit 'b9b83cc0804c30479c8a9efdefce9ee5d0b0a92c':
  Make snap with enterAlways|enterAlwaysCollapsed

Change-Id: I34867eb7c0a44c9083818ba0616a30049b110054