Merge "Fix instant app filter" into pi-dev