Merge "Fix landscape pattern enroll crash" into pi-dev