set android keep screen on
fix null pointer in sensor reading
Merge remote-tracking branch 'origin/master'