non-desktop: Avoid instantiation of huge amount of 'shells'.

Change-Id: Ic179924f437dd9197a0839f23ee4ba39a8a62f34