Settings: Bypass Alert Improvement

Change-Id: I913404710e3ccfd543dc81cb3deac7140d6c3285