Merge "Do not add display area features for untrusted display"