Merge "Fixes non-matching instant app behavior" into pi-dev