Merge "Change prepare bluetooth timeout from 7 seconds to 10 seconds"