Bump version
Fix potential NPE
Don't restart activity when docked