Merge "Fix PK Settings notification for non-keyboard devices"