Merge "Collapse Notification panel after tapping CLEAR ALL button" am: ca8b270063 am: d4b6e59cad
am: 3674a64029

Change-Id: Iaac0047f43ebfb721a1d632686e1c0afad44cb96