Also show Statements on Properties in non-experimental mode

Change-Id: I2a1969ff501fe4667fb42f325e9f28bf5aab6e2e
(cherry picked from commit e92535ce71e5391ee8bf3d0717f384babe351716)