3546364-Theme-Select: Fixed available theme select issue.

SOURABH SISODIArequested to merge
issue/tsbu-3546364:3546364-Theme-Select into 1.x

Closes #3546364

Merge request reports