[DemoApp][Android] Updated settings page UI
[Android] Minor bug fix