Merge "Fix bluetooth device forgetting" into nyc-dev