Optimize stylename handling in AbstractComponentConnector (#10937)

Change-Id: I91b05d0d794a2809c13f5f68d73eddb9f4c0a641
Merge "Optimize stylename handling in AbstractComponentConnector (#10937)" into 7.0