am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one...
am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
* commit 'e995ad15':
Support preferred activities with zero or one scheme in the filter