am 87b84ca6: am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

* commit '87b84ca6fc5070f2fbbb5f6d94863680b33d188b':
  Support preferred activities with zero or one scheme in the filter