Merge "Fix active permission touch target too small" into pi-dev