Added option to Swap Storage from NT Settings

Change-Id: Ie96208b1012a0806e5c038fe2ca3ff8f01f9b110