Merge "Fix launcher apps reverse access" into pi-dev