Improved menu save/restore of page zero to avoid conflicts with SIDs

Change-Id: I734963798cb094899850cd3d4b6e952578d62451