Merge "Two fixes for custom filter activity."