Merge "Move fromStableParcelable to KeepaliveController"