Fix unexpected flip to Settings

Change-Id: I50036c95d8c7b730552a990f4078dc6d6cc8c309