Merge "Remove unused shelf state"