am 20812e96: Merge "Removing some unused functionalities" into ub-launcher3-burnaby

* commit '20812e96402900d3ac0e007b5b63faaf1b06e5f9':
  Removing some unused functionalities