Merge "Wrap context in order to apply correct theme" into main