[2/2] Settings: Chamber of Secrets

PS2: Rebase

Change-Id: I4bee793580fe32b022cf7cbfc7ca5195d2c9a434