Fix NullPointerException
Lint
Selected indicator
Improve timeout toast
Format again using Eclipse's default formatter