Merge "Fix instant app filtering in ApplicationsState" into oc-dev