Merge "Remove READ_COMMUNAL_STATE from Shell"