remove other devices from lunch menu too

Change-Id: If8f3fd7748e8284b98c8679f6a849ac1146e6a30