Merge "Fix companion device feature presence check"