Merge "QS: Add open/close animation for customization prototype"