Preventing unnecessary setLayout calls in workspace Separating getSystemProperty in a separate method
am: dfc8b6685b

Change-Id: I7cb0a1d38895351a70979b95b990a36261753de5