Add Back C-RoM & Power Menu Toggle

Change-Id: I59b2b8d5f0a4e12b10cd49bea1fd1f720b4ce2db