Prevent popup open when datafield is disabled (#13508).

Change-Id: I5bb3ec24ad15d832a43998a4cee49a61ae81562e
Merge changes from origin/7.1

d0bc54b Prevent popup open when datafield is disabled (#13508).

Change-Id: I3f15fa2d0774dfa0c91312d79822be94afcb0d34