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

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

Change-Id: Ib505e323bbbbcb95e53c44d6a90d8f56b275dff1