Merge "Fix instant app badge" into pi-dev