Merge proposals dependent on lp://qastaging/~brendan-donegan/checkbox/fwts_hybrid_sleep_version

1. fwts_hybrid_sleep_version
2. Dependent merge proposals