Added condition to show L2 only in expantion of grid if the L2 mode is not set.

Change-Id: I1fa5b0580e6b90a6807a3d3ed5697dcb3c332a52
Merge "Added condition to show L2 only in expantion of grid if the L2 mode is not set."