Merge "Properties view expansion no longer tied to hierarchy view expansion."