Merge "Moved panel expansion classes to shade package"