Merge "Only sleep following a role switch"