Merge "Fix crash from battery detail" into nyc-dev