Settings: Chamber of Secrets (2/2) [WIP]

PS2: Rebase

Change-Id: I4bee793580fe32b022cf7cbfc7ca5195d2c9a434