am 557280c1: Merge "Updating folder UI" into ub-launcher3-burnaby

* commit '557280c116db54ed2100eb0815e6d539d2b58252':
  Updating folder UI