Merge "Fix active permission touch target too small" into pi-dev am: bb668a2bb7
am: 62a0d4f32e

Change-Id: I7c08226c9984d5b3d306cba1eb2df047764dab8f