More Active Display stuff

Change-Id: Iaa5d58a0b10240b2e3bc893eb029b3c3423d38d3
Fix button settings

Change-Id: I2d8b52aff0566dcfe6d02fbb03a70cca69ff6e47
Fix blacklist settings

Change-Id: I39204fc06aad104ec94a2dae185944352be88036