Cleanup in PropertyView

Change-Id: I20eedd88c7119d4beb8679d35fea23f248031b22
Merge "Cleanup in PropertyView"